]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
screenShield: fix empty screen shield
authorLionel Landwerlin <llandwerlin@gmail.com>
Wed, 26 Jun 2013 13:47:33 +0000 (14:47 +0100)
committerLionel Landwerlin <llandwerlin@gmail.com>
Thu, 27 Jun 2013 10:14:09 +0000 (11:14 +0100)
If the drag action ends after something else has put the screen shield
into a different state we can end up in an inconsistent screen shield
state where the whole thing is empty.

https://bugzilla.gnome.org/show_bug.cgi?id=703126

js/ui/screenShield.js

index 254bc68ada9b24e50607bb6aee584b01e2918976..15cc65ffc29b26885f038d6ee5ca4ac9e463f86b 100644 (file)
@@ -720,6 +720,8 @@ const ScreenShield = new Lang.Class({
     },
 
     _onDragEnd: function(action, actor, eventX, eventY, modifiers) {
+        if (this._lockScreenState != MessageTray.State.HIDING)
+            return;
         if (this._lockScreenGroup.y < -(ARROW_DRAG_THRESHOLD * global.stage.height)) {
             // Complete motion automatically
            let [velocity, velocityX, velocityY] = this._dragAction.get_velocity(0);